Royal Marines Commando #4098
Merged
Royal Marines Commando #4098
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # icons/mob/humans/onmob/items_lefthand_0.dmi # icons/mob/humans/onmob/items_lefthand_1.dmi # icons/mob/humans/onmob/items_righthand_0.dmi # icons/mob/humans/onmob/items_righthand_1.dmi # icons/mob/humans/onmob/suit_1.dmi # icons/mob/humans/onmob/uniform_0.dmi # icons/obj/items/clothing/cm_hats.dmi # icons/obj/items/clothing/cm_suits.dmi # icons/obj/items/clothing/uniforms.dmi # icons/obj/items/weapons/guns/attachments/barrel.dmi
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Sprites
# Conflicts: # icons/mob/humans/onmob/back.dmi # icons/mob/humans/onmob/items_lefthand_0.dmi # icons/mob/humans/onmob/items_righthand_0.dmi # icons/obj/items/clothing/backpacks.dmi
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
harryob
requested changes
Sep 6, 2023
Co-authored-by: harryob <[email protected]>
Co-authored-by: harryob <[email protected]>
Co-authored-by: harryob <[email protected]>
Co-authored-by: harryob <[email protected]>
Co-authored-by: harryob <[email protected]>
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
harryob
approved these changes
Sep 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
This PR adds the Royal Marines Commando under the TWE as a faction and as an ERT, this PR is part 1 and more is planned to be added the reason why it isn't being added in this PR is that it isn't fully complete and these sprites have been waiting a very long time
Royal Marines Roles
Smartgunner: Special smart-gun sprite, gameplaywise only difference is its use of holo targetting rounds on top of its regular ammo, making it a menace in a group
Breacher: The breacher combines his high armor with a ballistic shield and a rifle built to be used in one hand. This guy is hard to bring down
Marksman: The marksman rifle is limited to 20 rounds from 30 but has increased damage and a mini scope with no slowdown
Rifleman: The grunts of the three world empire are highly maneuverable their rifle while slower firing and only containing 30 rounds has no movement slowdown
Teamleader/Officer: the leaders are basically the same as the rifleman but with better skills and a VP78
The Royal Marines are equipped for every possibility in the field, they are all trained medics and carry the equipment to boot. Aside from the breacher, they are all quick on their feet, and their weapons while across the board slower than their marine equivalents pack the punch needed to get the job done.
Fluff, the royal marines in this area are based out of the HMS Patna working alongside the HMS Thunderchild to assist the United Americas in protecting the outer colonies from increasing CLF activity
Explain why it's good for the game
Gives the TWE some representation, adds some cool new faction stuff, an ERT, and equipment
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑 Triiodine, Frans, Warfan, SpartanBobby, Twomper, Roboticpotato, Tophat Penguin,forest2001
add: Added Royal Marines commando ERT and faction
add: Updates Riot shield sprite, adds metal shield as well (sprites from trio)
add: TWE ERT station
add: F903 Rifle, Royal marines commando armour sets, new smartgun with holotargetting rounds for royal marines commando
add: Calico shotgun, pistol and SMG sprites to the codebase made by Triodine
add: royal marines commando HEDP and HIDP grenades
/:cl: